Bump org.apache.logging.log4j:log4j-core from 2.17.1 to 2.20.0 by Xtansia · Pull Request #8307 · opensearch-project/OpenSearch

Xtansia · 2023-06-28T01:43:18Z

Description

Bump org.apache.logging.log4j:log4j-core from 2.17.1 to 2.20.0
Use log4j's PluginProcessor annotation processor for plugin discovery
Remove usage of deprecated explicit plugin discovery
Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff
Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

github-actions · 2023-06-28T01:48:39Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/18527/
CommitID: ac31062
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-06-28T01:52:04Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/18528/
CommitID: 5922da6
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

reta · 2023-06-28T02:05:34Z

@Xtansia there is another one on the same subject, #7586

github-actions · 2023-06-28T02:25:31Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/18530/
CommitID: 89381f3
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

github-actions · 2023-07-05T22:01:44Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/19189/
CommitID: 93e4526
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-07-06T00:11:43Z

Gradle Check (Jenkins) Run Completed with:

RESULT: ABORTED ❌
URL: https://build.ci.opensearch.org/job/gradle-check/19194/
CommitID: 93e4526
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-07-06T22:05:42Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/19333/
CommitID: 93e4526
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

github-actions · 2023-07-06T23:07:40Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/19337/
CommitID: e3b9302
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
Is the failure a flaky test unrelated to your change?

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

github-actions · 2023-07-10T22:30:24Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.search.SearchWeightedRoutingIT.testSearchAggregationWithNetworkDisruption_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteStoreIT.testStaleCommitDeletionWithInvokeFlush
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testPrimaryRelocationWithSegRepFailure

URL: https://build.ci.opensearch.org/job/gradle-check/19759/
CommitID: bb2348a
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Xtansia · 2023-07-10T22:56:49Z

@dblock @reta I think this is good to merge now?

reta · 2023-07-11T16:01:04Z

@dblock @reta I think this is good to merge now?

Certainly, thanks @Xtansia , just waiting for the build

github-actions · 2023-07-11T16:35:57Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.snapshots.DedicatedClusterSnapshotRestoreIT.testIndexDeletionDuringSnapshotCreationInQueue
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication
      1 org.opensearch.indices.replication.SegmentReplicationRelocationIT.testRelocateWhileContinuouslyIndexingAndWaitingForRefresh
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

URL: https://build.ci.opensearch.org/job/gradle-check/19901/
CommitID: dcdc9a0
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

opensearch-trigger-bot · 2023-07-11T16:46:33Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8307-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0b42c2c0e41c8af6c527eace384d4ad4245a5a1f
# Push it to GitHub
git push --set-upstream origin backport/backport-8307-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-8307-to-2.x.

reta · 2023-07-11T17:33:20Z

@Xtansia needs manual backport sadly

MaxKsyunz · 2023-07-11T17:44:04Z

Will this be included in 2.9?

…earch-project#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com> (cherry picked from commit 0b42c2c)

- Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com>

…o 2.20.0 (#8645) * Bump org.apache.logging.log4j:log4j-core from 2.17.1 to 2.20.0 (#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com> (cherry picked from commit 0b42c2c) * ignoreMissingClasses Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>

…earch-project#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com>

…earch-project#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com> Signed-off-by: sahil buddharaju <sahilbud@amazon.com>

…earch-project#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com>

…earch-project#8307) - Use log4j's PluginProcessor annotation processor for plugin discovery - Remove usage of deprecated explicit plugin discovery - Pass through Configuration in OpenSearchJsonLayout to work around https://issues.apache.org/jira/browse/LOG4J2-3562 Signed-off-by: Thomas <tsfarr@amazon.com> Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Andrew Ross <andrross@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>

Xtansia force-pushed the update/log4j2 branch from ac31062 to 5922da6 Compare June 28, 2023 01:44

Xtansia added the backport 2.x Backport to 2.x branch label Jun 28, 2023

Xtansia force-pushed the update/log4j2 branch from 5922da6 to 89381f3 Compare June 28, 2023 01:56

Xtansia added the dependencies Pull requests that update a dependency file label Jun 28, 2023

Merge branch 'main' into update/log4j2

93e4526

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

dblock approved these changes Jul 6, 2023

View reviewed changes

Merge remote-tracking branch 'upstream/main' into update/log4j2

e3b9302

Merge branch 'main' into update/log4j2

bb2348a

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

Merge branch 'main' into update/log4j2

dcdc9a0

reta merged commit 0b42c2c into opensearch-project:main Jul 11, 2023

This was referenced Jul 11, 2023

Bump log4j version. opensearch-project/sql#1848

Merged

[Backport 2.x] Bump log4j version. opensearch-project/sql#1850

Merged

Xtansia deleted the update/log4j2 branch July 11, 2023 21:11

Xtansia mentioned this pull request Jul 11, 2023

[Backport 2.x] Bump org.apache.logging.log4j:log4j-core from 2.17.1 to 2.20.0 #8645

Merged

RyanL1997 mentioned this pull request Jul 11, 2023

Add release notes for 2.9.0.0 opensearch-project/security#2992

Merged

Conversation

Xtansia commented Jun 28, 2023

Description

Check List

Uh oh!

github-actions bot commented Jun 28, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jun 28, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

reta commented Jun 28, 2023

Uh oh!

github-actions bot commented Jun 28, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jul 5, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jul 6, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jul 6, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jul 6, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

github-actions bot commented Jul 10, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

Xtansia commented Jul 10, 2023

Uh oh!

reta commented Jul 11, 2023

Uh oh!

github-actions bot commented Jul 11, 2023

Gradle Check (Jenkins) Run Completed with:

Uh oh!

opensearch-trigger-bot bot commented Jul 11, 2023

Uh oh!

reta commented Jul 11, 2023

Uh oh!

MaxKsyunz commented Jul 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

MaxKsyunz commented Jul 11, 2023 •

edited

Loading